Cleanup WaMd.java