LOL get rid of useless class
clean up integration spec