This should be removed; unnecessary anonymous inner class here