First cleanup. Everything but the parser has been altered appropriately