Some Cleanup of temporary code.