Cleanup some methods