wip isomorph cleanup