Cleanup WaMdActivity.java