removed remaining server variables current.*
Merge branch 'dev'
cleaned up after merge from dev