cleaning up all code. Rebuilding with new assumptions