Simplify upload

Switches to just id as input for upload methods for consistency.