Cleanup

Some cleanup plus only give a warning about non-assembly missing derivs.