Removed TODO comments