Revert changes for dependencies and parser; Remove unused file use_sample