Block class revampt, remove some deprecation