#30 deleted unused helpers class