CLN: clean up blocks.py
Clean up while going through code. Will probably check more files.
Reverted some changes of unused arguments in function, they still fail tests. can you merge master; unrelated test failures should be fixed done @jbrockmendel  thanks @erfannariman 
