Cleaned up old TODOs