-- Cleaned up some debug code.