Removed unused stuff, made Board vars local