Remove legacy code from the time the dependencies were included
Fixed issue #2