done first round of cleanup for fdactivity.java