Removed project.properties
Added project.properties
Code cleanup and optimization