Removed some excess code from header