Two new actions, cleanup code.