Removed debugging code; progress on mobile