removing some trash code