Removed old version code - remainer of merge conflicts