Removed all anonymous inner classes