Cleaned up some left behind things