fixes #184 Remove non-production code