Remove Converter and fix all bugs