Deleted all unused code - cleaned up