Remove unneeded invokables