Licenseheader adjusted and unused imports removed