cleaned up everything but muxing