Cleanup again

ftp still needs work...