removed some old files
changes to deprecated args catching