Restructure…again, cleanup