Cleanup
Should work now