Uncomment generation import
Remove unnecessary signatures