More Cleanup

Remove old stuff