clean-up, removing unused parts