Continued ant build work
Cleanup classes...again