cleanup and dependency tweeks