Remove test project and clean up code