Started migration over to ARC. Code clean up.