Cleanup

Some clean up