Clean up

cleaned unused methods