Adding license to email and additonal clean up