Some clean up.  Removed fisheye include.