Removed data fields I don't need right now