removing ARM code (we'll handle this with SVN) and adding server-side code