cleanup some methods