Some fixes and clean-up
Remove debug line