Merge branch 'pablo/cleanups'