remove debug statements
template and controller reorg