Changes to not require private configuration
Some code cleanups