(Filebrowser) Cleanups