Fixing some trash code