Cleanup of unnecessary changes