Issue #396 - remove unneeded code