Removed bad logged/unlogged code