removing unneeded generic file overrides and cleaning up some deprication warnings