Code cleanup, potential add platform.