Fix a  few issues in rendering . Remove some pieces that are library specific / not needed