remove block types, refactroing