Removed obsolete code & fixed grammar