Very nice to see all that code removed from this class here!