more 'cleanup' while i cower from the real problems