Removed some hard coded static references
See issue #46