Change calls to legacy methods
@returns => @return
More photo handling cleanups