Cleanup of old code, preparing to upload.