Removing old initialization code.
Merge pull request #2 from pedroigor/master

See comments.