Reverting cost related stuff and forking into a new branch.