Remove redundant or non-required header imports
Update category name, and header comments