clean up handlers, dependencis