Additional Cleaning

Changes as they're logged