Close signature controller
remove dead code
Remove headers
Clean up headers