Revert "Merge pull request #1 from joomla-framework/InternalCleanup"

This reverts commit 8e867eb8921da72cfacf8e3fb25f7fcacfbb2765, reversing
changes made to abd3996d83b38d9ce4d6e3d8bce2a130a9f203dc.