Fixed mismatching block content tag
Removed unused functions and fixed compilation issues