Added class removal and fixed ability spec filter