Fixed path errors and removed obsolete code