Cleanup FileStoreHelpers + move meta menu