Removed more unnecessary code. 

Changed manner of licence comments.