Removed @todo from code