Clean up

Removed unnecessary methods