Refactoring

Removed additional default data