Trimming some fat
More cleanup