Some cleanup of stuff I don't use.