deleted some crud, left other crud