Removed todo code