More cleanup
The actual cleanup
Added SalemFarm
Whoops that isn't simpleproject
Final cleanup (for now)