Removed more unnecessary code. 

Use of Netbeans inspector again
merge complete