Removed TODOs in CLT Steps