Removed old features and fix #25.