Get rid of __unsafe_unretained properties and clean up headers