304 logic clean up