code cleanup, remove old controller/form beans and test controller

Reviewer: Tiffany Go

Issues: None