admin: blocks code cleanup