Removed all instances of class prefix