Cleaned out old header-file nonsense