Cleanups + remove some block() calls