Removes some todo's