subowner, some cleanup