Fixed all overrides in all blocks and removed useless methods