Removed old/obsolete code

Resolves issue #44