Code cleanup. Removal of files no longer being used as well as commented
out code which is no longer applicable.