update licence headers and remove un-used import classes