bare code cleanup
cleanup