Skeleton cleanup, dummy action rewritten