Remove some features and fix bugs