Removed unneded headers