Remove unneccessary blocks