Removed unneeded fields from models