[BUG #5823] Removed todo comments and created bug reports if necessary.