Cleanup code and delete excluded project
Add merge etracs dbstructure