Code cleanup
Removed physics, for now