Some cleanup, and remove another thread so the FTP server just runs in one thread.
Authored by: dannybackx 2019-12-15
Parent: [r273]
Child: [r275]