Removed unfinished session stuff from master