Clean up

a few more clean ups;

especially the bits removed w/ 72fa85a do look like they do not really belong in here