Remove useles default values

Also set upload as false by default