Removing WIP code that shouldn't have been in the final check in.