Cleanup
Foundation compile has issues