A few more lines removed from Action switch