Removed dependancies and fixed rift integration