Updated package name
Stripped away unused code