Tried to remove samples dependency