Revert "Bug fixing"

Reverts ecarlini/smartfed#1