some changes
removed unneeded dependency