Re-arrange, remove some lists