Removing Dependicies not used, updated comments