Final clean up including save test for edit controller and remooved last of the poymer stuff