remove temporary debug helper
remove unused import
update solver impl