final cleanup from converting to java project