Removed commented out code and fixed a couple of karma tests.