A little reorganizing
Remove remnants