Some more cleanup, might be some broken bits in there.