Removed TODO items. If profiling is needed someone will add the functionality.