cleanup unused code parts