[#61] Remove comments and unnecessary code