Removing some todo's