Cleanup after some mistakes