Removed unneeded old code