cleanup and add quad for lighting