update conneciton inheritance framework: enhance the cleanup process
minor fix
minor improvement