Cleanup, still not working.
More cleanup