Got rid of unused imports
Fixed the owner / personal_owner / group_owner discrepency