Cleanup

Delete some unneeded  code.