Removed file upload stuff. Restarting without it.
Minor code cleanup.