Minor cleanups. Removed slamhound.