Fixed package names
Removed unused faff!