Doesn't look like this file is used
Some code cleanup