Resolve #256
Remove unused header
Merge branch 'master' into dev
Merge branch 'dev' into refactor/layer