Removed notes and extranious comments