Cleaning up interfaces for initial Bitcoin implementation