CONN:588-cleanup