[#40] Clean-up after merge & removed unnecessary comments.