Remove all references to aspects in classes