Misc Minor Changes

Removal of unwanted comments etc