Removed some old code from issue #22