Major cleanup

woff?