Clearing some trash code