Removed unused template macroses
Removed unused files
Removed unused files