Cleaned up a couple unnecessary items.