Removing unused stuff, addressing review comments