General clean-up, removing unused code, removing unused resources,
renaming resources