Cleanup, especially in spec_helper