Remove fields not needed for now