Removed config.properties and clean imports