trim fat, remove forms, update requirements