Cleaned up the temporary placeholder todos