Removed some deprecation warnings and cleaned up bitio