Removed legacy dependencies