Removed TODO statments