Remove 'dependency' on dropbox and clean up code