clean-up, dependencies changed