Code clean-up

Clean-up in code; removed debugging that is no longer needed.