Removed deprecated file & minor syntax changes