Clear up a bit, remove debug form