Removed everything, it's all depricated now