Final bits of code cleanup & simplification