Some couple of changes.

Got rid of unnecessary stuff.