Tweeks and changes after pulling latest from upstream.

 Removed a few files which were not needed, cleaned up, made sure it still works. Android doesn't capture as much as I'd like it to, but it does capture enough.