WIP general cleaning now that configuration works