Removed junk from developmental merge.