remove unused methods
fix failing test