Point & Gallery cleanup