Epic clean up continues