remove misc changes and add rendering