Fixed glide
Deleted unused file
Merge branch 'master' into iss70