Fixing some garbage