improvements
remove debug