Remove unused and move methods