Add license information and remove unneeded stuff...