Removing TODOs and doing cleaning