Removal of more code
Added name to license