small changes, remove old cascade stuff