Moved to ARC + more cleanup