Removed todo's