Merge branches 'cleanup' and 'less-el-get' into current