- Removed unused code, and unneeded macro