removed unused code or duplicated code; moved code only used once to where its used
Merge pull request #1131 from jclouds/cleanup

cleaning unused or only used once code