Removed some vars, working on models next.