KRS-One clean up