Remove unused stuff, better naming, cleanup