Improve rendering and remove not needed stuff