Raise better execption.
Remove old unused requires.