removing deprecated files and updating others