Refactoring

Removed default data