Cleanup for better starting point