Refactoring
Removed stuff