Removing useless code & replacing some layout with board