final couple tweaks, delete the few old things