Remove obsolete code.
Refactor to allow manual arguments to addAction