Moved cleanup outside of jar