Remove unused methods
Add simple noramlizer
Ignore failing test