Remove fallback for Protocol import and remove Protocol import and remove instances of Protocol in code

add some whitespace between functions to be in line with other code in the repo