removed commented sections
removed more commented sections