remove files that were meant to only exist in hasmany branch
add missing bits for touch-2.1.1 -> touch 2.2.1 conversion.