Fixed compile errors and pruned unneeded files (instead of fixing... not needed personally)