objective clean fixes