Code bloat removal, clear the main board from clutter