Remove deprecated methods
Fix broken specs