Minor changes
Removed restreams, cleaned up activities, and various other things