Updated src files and removed old dependencies