Remove and clean up  unused methods