removing old stub code