REM: some obsolete and dead code has been removed.