Cleaned up session and exports in 1.2