Killing legacy manual forms

Signed-off-by: José Luis Di Biase <josx@interorganic.com.ar>
Updating collection to not call globals

Signed-off-by: José Luis Di Biase <josx@interorganic.com.ar>