Clean up pre physics implementation