Remove unused methods
Fix merge conflicts