More code idiocy cleanup