Fixes for upgrade files.

Signed-off-by: Norv <a.w.norv@gmail.com>
Small cleanups.

Signed-off-by: Norv <a.w.norv@gmail.com>
Remove mailtodisk() (debugging-purpose function)

Signed-off-by: Norv <a.w.norv@gmail.com>
cleanup, remove debugging call

Signed-off-by: Norv <a.w.norv@gmail.com>