Did some Refactoring
Removed useless class
Removed useless windows transition