Cleaning up. Kept only the necessary stuff. Refactored features.