WIP Time to remove filepicker