removed SaveHandler and cleaned up other handlers.