*8929* General cleanup