Removing unused stuff, addressing review comments

another bug fix from my last pull request