Finalization: removed unneeded templates and finalized cleanup for now