Code Cleaning

Version 0.1.2.1

- Code Cleaning
- Removed Not Used Handlers