Some cleanup

1. Removing a bug # from code which is fixed.
2. Removing a piece of test that was added while testing.