Removed all YOPA references and old code