- removed unused and refactored some methods