remove lots of non-ducktyping