Removed unneeded code from special blocks