Removed TODO statements