Removed code that doesn't currently work.