Removed things from TODO