[Generator] made some cleanup (unused code)