[ISSUE_4] cleanup