Fixed dependency issue after lots of deleted code