Cleaned up after VS hickups