Clean AbstractType. CS fixes. Optimizing BlockService