Lots of clean up

Removed Old Methods (the commented out stuff) and files that are no
longer needed (windmill test).