Cleaning up old and unused methods