Removes some outdated TODOs
Removes unused variable with getter and setter