remove step definitions and add some public getters