Added Cleanup to SPA and BFS is working-ish