code: cleanup