Clean old tablespaces bug fixing