minor #1004 Register clean up (henrikbjorn)
minor #1004 Register clean up (henrikbjorn)

This PR was squashed before being merged into the 2.0.x-dev branch (closes #1004).

Discussion
----------

Register clean up

Commits
-------

354b766 Register clean up

akucherevskiy/developex_test,romainneutron/Silex,romainneutron/Silex,fabpot/Silex,akucherevskiy/developex_test,gencer/Silex,romainneutron/Silex,mTorres/Silex,fabpot/Silex,silexphp/Silex,akucherevskiy/developex_test,mTorres/Silex