cleanup old code
Merge branch 'master' of https://github.com/meegpipe/meegpipe