Getting rid of these because they aren't used and just confuse things.
Bug fix.