Further cleanup, hopefully fixed .jar