Removed the old Setup