Cleanups & no-op refactorings