Remove useless methods
Add missing method