removing non-required fields and mistakes

hopefully