Fix bugs and drop some undesired features.
This will create a new commit in order to revert the existing changes.
