extends App removed from a few classes