Deleted obsolete code
Minor tweaks