Removed old (broken) code. Needs reworking.