Cleaned Up Code a Bit

Got rid of most/all of the un-used code bits now that I've tentatively
finished my FoV experiments.