Removed previous (and now redundant) work.