missed break in case, removed commented out code not needed anymore