cleaned some trash code