Removed some commented out code
Added a comment
Merge branch 'header-height-bug-fix' into develop