Removing unused stuff, addressing review comments

@rostafiychuk addressing your review comment here