General cleaning after bugfix. There is still a NullPointerException with the List Requirements button.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>