Removed header includes and using