Remove unnecessary templates
Merge branch 'big_board' into development