remove debug prints and fix naming clash