Cleanup of render stuff

Signed-off-by: Jack Huey kitskub@gmail.com
Merge pull request #567 from kitskub/client-connection

Cleanup of render stuff