removed some trash code