Added remove class functionality