Removed some stuff that was left after package renaming