Removed commentted codes