Cleanup, remove restc dep