Tidy up, remove unused imports & dependencies, add licenses