removed anonymous inner classes