Removed arguement parser