Cleanup: removed unused code for work with headers.
#23 Cleanup: code is removed due to changes in plan.