Cleanup a bit
remove unused.