Removed temp classes