Merged seedpeer branch with master branch, cleanup