Clean up the existing core functionality of the history

[antarcticrainforest]

After the creation of the history api we will have to make use of it on the client side.