removed some unused old code