Further cleanup

Further cleanup