More Cleanup

Some changes should be tested