Final Cleanup

Final deletion of duplicate and superfluous files.