Remove hard coded list/status switches