General clean-up, delete unused files, remove commented-out code etc